[PATCH] 8378603: libfontmanager FFM path needs to use FFM to locate both malloc and...

Bug: https://bugs.openjdk.org/browse/JDK-8378603
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openjdk-25/+bug/2155650
Origin: upstream, https://github.com/openjdk/jdk/commit/704efcb20dbe2f77e991b2343d5dccdf524882ba
Reviewed-by: kizune, azvegint, jdv
Gbp-Pq: Name jdk-8378603.diff

diff --git a/src/java.desktop/share/classes/sun/font/HBShaper.java b/src/java.desktop/share/classes/sun/font/HBShaper.java
index 0060d7c637627b257f46102de23698009e0f58f3..3caa9f2bc3b87426c6c85edd1c99c929ebd208dd 100644 (file)
--- a/src/java.desktop/share/classes/sun/font/HBShaper.java
+++ b/src/java.desktop/share/classes/sun/font/HBShaper.java
@@ -173,6 +173,17 @@ public class HBShaper {
         MethodHandle tmp1 = LINKER.downcallHandle(malloc_symbol, mallocDescriptor);
         malloc_handle = tmp1;
 
+        MemorySegment free_symbol = SYM_LOOKUP.findOrThrow("free");
+        long free_address = free_symbol.address();
+        FunctionDescriptor setFreeFnDescriptor = FunctionDescriptor.ofVoid(JAVA_LONG);
+        MemorySegment set_free = SYM_LOOKUP.findOrThrow("HBSetFreeFn");
+        @SuppressWarnings("restricted")
+        MethodHandle set_free_handle = LINKER.downcallHandle(set_free, setFreeFnDescriptor);
+        try {
+            set_free_handle.invokeExact(free_address);
+        } catch (Throwable t) {
+        }
+
         FunctionDescriptor createFaceDescriptor =
             FunctionDescriptor.of(ADDRESS, ADDRESS);
         MemorySegment create_face_symbol = SYM_LOOKUP.findOrThrow("HBCreateFace");

diff --git a/src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc b/src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc
index 590c273d151a48fe1a5d7d82ecb03ad2b7505c34..1e5db4e0adf6ee59c0e35fbe7432b0557fd9cf7c 100644 (file)
--- a/src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc
+++ b/src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,6 +174,22 @@ static void _do_nothing(void) {
 
 typedef int (*GetTableDataFn) (int tag, char **dataPtr);
 
+typedef void (*ffm_free_t) (void *ptr);
+
+static ffm_free_t ffm_free_fn = NULL;
+
+/* We pass the address of "free" which was obtained by FFM so that it matches
+ * the malloc found by FFM
+ */
+#include <stdio.h>
+static void ffmfree(void *ptr) {
+    if (ffm_free_fn != NULL) {
+        ffm_free_fn(ptr);
+    } else {
+        free(ptr);
+    }
+}
+
 static hb_blob_t *
 reference_table(hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) {
 
@@ -200,11 +216,15 @@ reference_table(hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) {
    */
   return hb_blob_create((const char *)tableData, length,
                          HB_MEMORY_MODE_WRITABLE,
-                         tableData, free);
+                         tableData, ffmfree);
 }
 
 extern "C" {
 
+JDKEXPORT void HBSetFreeFn(void *free_fn) {
+    ffm_free_fn = (ffm_free_t)free_fn;
+}
+
 JDKEXPORT hb_face_t* HBCreateFace(GetTableDataFn *get_data_upcall_fn) {
 
     hb_face_t *face = hb_face_create_for_tables(reference_table, get_data_upcall_fn, NULL);